Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix for windows ktlint issue #585

Merged
merged 3 commits into from
Oct 26, 2022
Merged

fix for windows ktlint issue #585

merged 3 commits into from
Oct 26, 2022

Conversation

sbcd90
Copy link
Collaborator

@sbcd90 sbcd90 commented Oct 3, 2022 •
edited
Loading

Signed-off-by: Subhobrata Dey sbcd90@gmail.com

Issue #, if available:
fix for windows ktlint issue
#573
#570

Description of changes:
fix for windows ktlint issue. tested this on windows server 2022 on ec2.

CheckList:
[X] Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@sbcd90
fix for windows ktlint issue
d68f655 
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
@peterzhuamazon
Copy link
Member

Thanks @sbcd90.

Added 4 more backports to 2.x, 2.3, 1.x, 1.3.

Thanks.

@sbcd90
add windows build to alerting
dd2c480 
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Oct 25, 2022 •
edited
Loading

Codecov Report

Merging #585 (dd2c480) into main (3a844f8) will decrease coverage by 0.65%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main     #585      +/-   ##
============================================
- Coverage     76.85%   76.20%   -0.66%     
+ Complexity      178      116      -62     
============================================
  Files           167      124      -43     
  Lines          8556     6451    -2105     
  Branches       1268      942     -326     
============================================
- Hits           6576     4916    -1660     
+ Misses         1346     1052     -294     
+ Partials        634      483     -151
Impacted Files Coverage Δ
...rting/transport/TransportAcknowledgeAlertAction.kt 79.56% <0.00%> (-4.79%) ⬇️
...rch/alerting/opensearchapi/OpenSearchExtensions.kt 50.00% <0.00%> (-4.06%) ⬇️
...h/alerting/transport/TransportGetFindingsAction.kt 88.99% <0.00%> (-3.25%) ⬇️
...rch/alerting/transport/TransportGetAlertsAction.kt 75.51% <0.00%> (-2.76%) ⬇️
...otlin/org/opensearch/alerting/alerts/AlertMover.kt 62.96% <0.00%> (-2.43%) ⬇️
...destinationmigration/DestinationConversionUtils.kt 70.00% <0.00%> (-1.12%) ⬇️
...tlin/org/opensearch/alerting/util/AlertingUtils.kt 60.52% <0.00%> (-1.02%) ⬇️
...erting/settings/SupportedClusterMetricsSettings.kt 16.27% <0.00%> (-0.80%) ⬇️
.../util/SupportedClusterMetricsSettingsExtensions.kt 34.69% <0.00%> (-0.73%) ⬇️
...n/kotlin/org/opensearch/alerting/AlertingPlugin.kt 93.50% <0.00%> (ø)
... and 59 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@sbcd90
add windows build to alerting
9e40e33 
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
@sbcd90 sbcd90 merged commit 49fbb4d into opensearch-project:main Oct 26, 2022
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-585-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 49fbb4dd9cacc8355a23675e34eda49a0038384b
# Push it to GitHub
git push --set-upstream origin backport/backport-585-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-585-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.3 1.3
# Navigate to the new working tree
cd .worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-585-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 49fbb4dd9cacc8355a23675e34eda49a0038384b
# Push it to GitHub
git push --set-upstream origin backport/backport-585-to-1.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.3

Then, create a pull request where the base branch is 1.3 and the compare/head branch is backport/backport-585-to-1.3.

@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 26, 2022
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 26, 2022
@sbcd90 @github-actions
fix for windows ktlint issue (#585)
45283a9 
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
(cherry picked from commit 49fbb4d)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-585-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 49fbb4dd9cacc8355a23675e34eda49a0038384b
# Push it to GitHub
git push --set-upstream origin backport/backport-585-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3

Then, create a pull request where the base branch is 2.3 and the compare/head branch is backport/backport-585-to-2.3.

sbcd90 pushed a commit that referenced this pull request Oct 26, 2022
@opensearch-trigger-bot
fix for windows ktlint issue (#585) (#624)
bc79b45 
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
sbcd90 pushed a commit to sbcd90/alerting that referenced this pull request Nov 2, 2022
@opensearch-trigger-bot @sbcd90
fix for windows ktlint issue (opensearch-project#585) (opensearch-pro…
fb76979 
…ject#624)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
sbcd90 pushed a commit that referenced this pull request Nov 2, 2022
@opensearch-trigger-bot @sbcd90
fix for windows ktlint issue (#585) (#624)
e15142d 
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
@lezzago lezzago mentioned this pull request Jun 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterzhuamazon peterzhuamazon peterzhuamazon approved these changes

@qreshi qreshi qreshi approved these changes

@dblock dblock dblock approved these changes

@praveensameneni praveensameneni Awaiting requested review from praveensameneni praveensameneni is a code owner

Assignees
No one assigned
Labels
backport 1.x backport 1.3 backport 2.x backport 2.3
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sbcd90 @peterzhuamazon @codecov-commenter @dblock @qreshi